Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 14 Jan 2010 23:01:38 +0000 (23:01 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 14 Jan 2010 23:01:38 +0000 (23:01 +0000)

Trivial merge